Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Jun 2011 00:58:31 +0000 (17:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Jun 2011 00:58:31 +0000 (17:58 -0700)
commit81211a6cc21dc2f51faa4d255c94a909fd70636f
tree7ff8c874356a7c4f76449feae68405016fdf147d
parentebc36b1c26236aa35a3b7bcdbe7378c517fc9fa9
parent920861079472522052bf3169f0fb686fb013e157
Merge from trunk.